From a70be72342b6d22a8494f5b2b046240e6a53b769 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 10 Jul 2014 13:53:36 -0700
Subject: [PATCH] Pass through extra arguments to `cargo test`

This allows `cargo test` usage to filter test being run, use --nocapture, etc.
---
 src/bin/cargo-test.rs    |  4 +++-
 tests/test_cargo_test.rs | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/bin/cargo-test.rs b/src/bin/cargo-test.rs
index bee0541ce..fdd9dce72 100644
--- a/src/bin/cargo-test.rs
+++ b/src/bin/cargo-test.rs
@@ -59,7 +59,9 @@ fn execute(options: Options, shell: &mut MultiShell) -> CliResult<Option<()>> {
     let test_dir = root.dir_path().join("target").join("test");
 
     for file in test_executables.iter() {
-        try!(util::process(test_dir.join(file.as_slice())).exec().map_err(|e| {
+        try!(util::process(test_dir.join(file.as_slice()))
+                  .args(options.rest.as_slice())
+                  .exec().map_err(|e| {
             CliError::from_boxed(e.box_error(), 1)
         }));
     }
diff --git a/tests/test_cargo_test.rs b/tests/test_cargo_test.rs
index 85129fa1f..3727a0713 100644
--- a/tests/test_cargo_test.rs
+++ b/tests/test_cargo_test.rs
@@ -239,3 +239,43 @@ test!(dont_run_examples {
     assert_that(p.cargo_process("cargo-test"),
                 execs().with_status(0));
 })
+
+test!(pass_through_command_line {
+    let p = project("foo")
+        .file("Cargo.toml", r#"
+            [package]
+            name = "foo"
+            version = "0.0.1"
+            authors = []
+        "#)
+        .file("src/lib.rs", "
+            #[test] fn foo() {}
+            #[test] fn bar() {}
+        ");
+
+    assert_that(p.cargo_process("cargo-test").arg("bar"),
+                execs().with_status(0)
+                       .with_stdout(format!("\
+{compiling} foo v0.0.1 (file:{dir})
+
+running 1 test
+test bar ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured\n\n\
+                       ",
+                       compiling = COMPILING,
+                       dir = p.root().display()).as_slice()));
+
+    assert_that(p.cargo_process("cargo-test").arg("foo"),
+                execs().with_status(0)
+                       .with_stdout(format!("\
+{compiling} foo v0.0.1 (file:{dir})
+
+running 1 test
+test foo ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured\n\n\
+                       ",
+                       compiling = COMPILING,
+                       dir = p.root().display()).as_slice()));
+})
-- 
2.30.2